Merge tag 'upstream/1.8.0+dfsg1'
authorJochen Sprickerhof <git@jochen.sprickerhof.de>
Tue, 16 Aug 2016 11:47:40 +0000 (13:47 +0200)
committerJochen Sprickerhof <git@jochen.sprickerhof.de>
Tue, 16 Aug 2016 11:47:40 +0000 (13:47 +0200)
commit2ee5e6bfc2b209de004b7b06f9a3af97f5b99076
tree9ac489e3b60efa143aefd92e6661b964b75eaee1
parent3a78e24f354ebabcd5f83359f734a27530666494
parentef3a772ac664fd10fbf34ea6382101a7599a6c65
Merge tag 'upstream/1.8.0+dfsg1'

Upstream version 1.8.0+dfsg1